修改bug

src/components/goodsSelect/configuration/mainList.json

@@ -3,7 +3,6 @@
   "lazy": true,
   "tip": false,
   "simplePage": true,
-  "searchSpan": 12,
   "searchMenuSpan": 12,
   "searchMenuPosition": "right",
   "dialogWidth": "60%",
@@ -24,7 +23,8 @@
     {
       "label": "商品编码",
       "prop": "code",
-      "search": false,
+      "search": true,
+      "searchSpan": 8,
       "width": 100,
       "rules": [
         {
@@ -51,6 +51,8 @@
     {
       "label": "商品类别",
       "prop": "goodsTypeName",
+      "search": true,
+      "searchSpan": 8,
       "hide": true,
       "addDisabled": false,
       "multiple": true,

src/components/price-Library/configuration/mainList.json

@@ -1,6 +1,8 @@
 {
   "border": true,
-  "searchMenuSpan": 6,
+  "searchMenuSpan": 16,
+  "searchIcon": true,
+  "searchIndex": 2,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
@@ -14,6 +16,8 @@
   "column": [{
       "label": "商品编号",
       "prop": "code",
+      "search": true,
+      "searchSpan": 8,
       "index": 1,
       "width": 100,
       "overHidden": true
@@ -22,7 +26,7 @@
       "label": "商品类别",
       "prop": "goodsTypeName",
       "search": true,
-      "searchSpan": 6,
+      "searchSpan": 8,
       "index": 2,
       "width": 100,
       "type": "select",
@@ -37,7 +41,7 @@
     {
       "label": "商品名称",
       "search": true,
-      "searchSpan": 6,
+      "searchSpan": 8,
       "prop": "cname",
       "index": 3,
       "width": 100,
@@ -46,7 +50,7 @@
     {
       "label": "英文名称",
       "search": true,
-      "searchSpan": 6,
+      "searchSpan": 8,
       "prop": "ename",
       "index": 4,
       "width": 100,

src/enums/column-name.js

@@ -1,149 +1,149 @@
 const columnName = [{
-  code: 0,
-  name: '出口报价单'
-}, {
-  code: 1,
-  name: '出口报价单商品信息'
-}, {
-  code: 2,
-  name: '出口采购订单'
-}, {
-  code: 3,
-  name: '出口采购订单商品信息'
-}, {
-  code: 4,
-  name: '出口销售订单'
-}, {
-  code: 5,
-  name: '出口销售订单商品信息'
-}, {
-  code: 6,
-  name: '出口收货订单'
-}, {
-  code: 7,
-  name: '出口收货订单商品信息'
-}, {
-  code: 8,
-  name: '出口发货单'
-}, {
-  code: 9,
-  name: '出口发货单商品信息'
-}, {
-  code: 10,
-  name: '出口采购询价'
-}, {
-  code: 11,
-  name: '出口采购询价商品信息'
-}, {
-  code: 12,
-  name: '出口船务询价'
-}, {
-  code: 13,
-  name: '出口船务询价商品信息'
-}, {
-  code: 14,
-  name: '国内销售订单'
-}, {
-  code: 15,
-  name: '国内销售订单商品明细'
-}, {
-  code: 16,
-  name: '国内销售订单费用明细'
-}, {
-  code: 17,
-  name: '国内采购订单'
-}, {
-  code: 18,
-  name: '国内采购订单商品明细'
-}, {
-  code: 19,
-  name: '国内采购订单费用明细'
-}, {
-  code: 20,
-  name: '国内发货单'
-}, {
-  code: 21,
-  name: '国内发货单商品明细'
-}, {
-  code: 22,
-  name: '国内发货单费用明细'
-}, {
-  code: 23,
-  name: '国内收货单'
-}, {
-  code: 24,
-  name: '国内收货单商品明细'
-}, {
-  code: 25,
-  name: '国内收货单费用明细'
-}, {
-  code: 26,
-  name: '出口报价单导入商品'
-}, {
-  code: 27,
-  name: '出口采购订导入商品'
-}, {
-  code: 28,
-  name: '出口销售导入商品'
-}, {
-  code: 29,
-  name: '出口收货导入商品'
-}, {
-  code: 30,
-  name: '出口发货导入商品'
-}, {
-  code: 31,
-  name: '出口采购询价导入商品'
-}, {
-  code: 32,
-  name: '出口船务询价导入商品'
-}, {
-  code: 33,
-  name: '封装费用明细信息'
-}, {
-  code: 34,
-  name: '封装费用明细导入信息'
-}, {
-  code: 35,
-  name: '封装上传附件'
-}, {
-  code: 36,
-  name: '进口采购订单'
-}, {
-  code: 37,
-  name: '进口采购明细'
-}, {
-  code: 38,
-  name: '进口销售订单'
-}, {
-  code: 39,
-  name: '进口销售明细'
-}, {
-  code: 40,
-  name: '进口收货单'
-}, {
-  code: 41,
-  name: '进口收货明细'
-}, {
-  code: 42,
-  name: '进口收货导入采购明细'
-}, {
-  code: 43,
-  name: '进口发货单'
-}, {
-  code: 44,
-  name: '进口发货明细'
-}, {
-  code: 45,
-  name: '进口发货导入销售明细'
-},
+    code: 0,
+    name: '出口报价单'
+  }, {
+    code: 1,
+    name: '出口报价单商品信息'
+  }, {
+    code: 2,
+    name: '出口采购订单'
+  }, {
+    code: 3,
+    name: '出口采购订单商品信息'
+  }, {
+    code: 4,
+    name: '出口销售订单'
+  }, {
+    code: 5,
+    name: '出口销售订单商品信息'
+  }, {
+    code: 6,
+    name: '出口收货订单'
+  }, {
+    code: 7,
+    name: '出口收货订单商品信息'
+  }, {
+    code: 8,
+    name: '出口发货单'
+  }, {
+    code: 9,
+    name: '出口发货单商品信息'
+  }, {
+    code: 10,
+    name: '出口采购询价'
+  }, {
+    code: 11,
+    name: '出口采购询价商品信息'
+  }, {
+    code: 12,
+    name: '出口船务询价'
+  }, {
+    code: 13,
+    name: '出口船务询价商品信息'
+  }, {
+    code: 14,
+    name: '国内销售订单'
+  }, {
+    code: 15,
+    name: '国内销售订单商品明细'
+  }, {
+    code: 16,
+    name: '国内销售订单费用明细'
+  }, {
+    code: 17,
+    name: '国内采购订单'
+  }, {
+    code: 18,
+    name: '国内采购订单商品明细'
+  }, {
+    code: 19,
+    name: '国内采购订单费用明细'
+  }, {
+    code: 20,
+    name: '国内发货单'
+  }, {
+    code: 21,
+    name: '国内发货单商品明细'
+  }, {
+    code: 22,
+    name: '国内发货单费用明细'
+  }, {
+    code: 23,
+    name: '国内收货单'
+  }, {
+    code: 24,
+    name: '国内收货单商品明细'
+  }, {
+    code: 25,
+    name: '国内收货单费用明细'
+  }, {
+    code: 26,
+    name: '出口报价单导入商品'
+  }, {
+    code: 27,
+    name: '出口采购订导入商品'
+  }, {
+    code: 28,
+    name: '出口销售导入商品'
+  }, {
+    code: 29,
+    name: '出口收货导入商品'
+  }, {
+    code: 30,
+    name: '出口发货导入商品'
+  }, {
+    code: 31,
+    name: '出口采购询价导入商品'
+  }, {
+    code: 32,
+    name: '出口船务询价导入商品'
+  }, {
+    code: 33,
+    name: '封装费用明细信息'
+  }, {
+    code: 34,
+    name: '封装费用明细导入信息'
+  }, {
+    code: 35,
+    name: '封装上传附件'
+  }, {
+    code: 36,
+    name: '进口采购订单'
+  }, {
+    code: 37,
+    name: '进口采购明细'
+  }, {
+    code: 38,
+    name: '进口销售订单'
+  }, {
+    code: 39,
+    name: '进口销售明细'
+  }, {
+    code: 40,
+    name: '进口收货单'
+  }, {
+    code: 41,
+    name: '进口收货明细'
+  }, {
+    code: 42,
+    name: '进口收货导入采购明细'
+  }, {
+    code: 43,
+    name: '进口发货单'
+  }, {
+    code: 44,
+    name: '进口发货明细'
+  }, {
+    code: 45,
+    name: '进口发货导入销售明细'
+  },
   {
     code: 46,
     name: '申请费用列表'
   }, {
     code: 47,
     name: '导入客户'
-  },{
+  }, {
     code: 48,
     name: '导入仓库'
   },
@@ -255,6 +255,10 @@ const columnName = [{
     code: 75,
     name: 'APP应用'
   },
+  {
+    code: 76,
+    name: '出口合同附件'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/util/columnSetting.js

@@ -10,6 +10,7 @@ export async function getColumnData(columnKey, mainOption) {
   if (localData != null) {
     option = localData;
   } else {
+    console.log(columnKey)
     let res = await getColumn({
       fileName: columnKey
     })

src/views/exportTrade/customerInquiry/config/commodity.json

@@ -1,6 +1,8 @@
 {
   "border": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
+  "searchIcon": true,
+  "searchIndex": 2,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
@@ -16,12 +18,14 @@
       "prop": "code",
       "index": 1,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "商品名称",
       "search": true,
-      "searchSpan": 16,
+      "searchSpan": 8,
       "prop": "cname",
       "index": 2,
       "width": 100,
@@ -32,6 +36,8 @@
       "prop": "ename",
       "index": 3,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
@@ -39,6 +45,8 @@
       "prop": "goodsTypeName",
       "index": 4,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -473,6 +473,7 @@
         typeUpload='CK'
         :data="orderFilesList"
         :disabled="detailData.status == 1"
+        :enumerationValue="76"
         deleteUrl="/blade-purchase-sales/orderfiles/update"
       />
     </div>

src/views/exportTrade/invoice/config/commodity.json

@@ -1,6 +1,8 @@
 {
   "border": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
+  "searchIcon": true,
+  "searchIndex": 2,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
@@ -11,55 +13,67 @@
   "menuWidth": "180",
   "selection": true,
   "tip": false,
-  "column": [
-    {
+  "column": [{
       "label": "商品编号",
       "prop": "code",
       "index": 1,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "商品名称",
       "search": true,
-      "searchSpan": 16,
+      "searchSpan": 8,
       "prop": "cname",
       "index": 2,
       "width": 100,
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 3,
+      "width": 100,
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
+    },
+    {
       "label": "商品类别",
       "prop": "goodsTypeName",
-      "index": 3,
+      "index": 4,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "中文规格",
       "prop": "typeno",
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文规格",
       "prop": "etypeno",
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "中文描述",
       "prop": "nameDescription",
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文描述",
       "prop": "cnameDescription",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     }

src/views/exportTrade/invoice/detailsPage.vue

@@ -203,6 +203,7 @@
         typeUpload="CK"
         :data="orderFilesList"
         :disabled="detailData.status == 1"
+        :enumerationValue="76"
         deleteUrl="/blade-deliver-goods/deliveryfiles/update"
       />
     </div>

src/views/exportTrade/purchaseContract/config/commodity.json

@@ -1,6 +1,8 @@
 {
   "border": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
+  "searchIcon": true,
+  "searchIndex": 2,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
@@ -11,55 +13,67 @@
   "menuWidth": "180",
   "selection": true,
   "tip": false,
-  "column": [
-    {
+  "column": [{
       "label": "商品编号",
       "prop": "code",
       "index": 1,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "商品名称",
       "search": true,
-      "searchSpan": 16,
+      "searchSpan": 8,
       "prop": "cname",
       "index": 2,
       "width": 100,
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 3,
+      "width": 100,
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
+    },
+    {
       "label": "商品类别",
       "prop": "goodsTypeName",
-      "index": 3,
+      "index": 4,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "中文规格",
       "prop": "typeno",
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文规格",
       "prop": "etypeno",
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "中文描述",
       "prop": "nameDescription",
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文描述",
       "prop": "cnameDescription",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     }

src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -234,6 +234,7 @@
         typeUpload="CK"
         :data="orderFilesList"
         :disabled="detailData.status == 1"
+        :enumerationValue="76"
         deleteUrl="/trade-purchase/purchase-order/removeByFiles"
       />
       <div>

src/views/exportTrade/purchaseInquiry/config/commodity.json

@@ -1,6 +1,8 @@
 {
   "border": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
+  "searchIcon": true,
+  "searchIndex": 2,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
@@ -11,55 +13,67 @@
   "menuWidth": "180",
   "selection": true,
   "tip": false,
-  "column": [
-    {
+  "column": [{
       "label": "商品编号",
       "prop": "code",
       "index": 1,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "商品名称",
       "search": true,
-      "searchSpan": 16,
+      "searchSpan": 8,
       "prop": "cname",
       "index": 2,
       "width": 100,
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 3,
+      "width": 100,
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
+    },
+    {
       "label": "商品类别",
       "prop": "goodsTypeName",
-      "index": 3,
+      "index": 4,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "中文规格",
       "prop": "typeno",
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文规格",
       "prop": "etypeno",
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "中文描述",
       "prop": "nameDescription",
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文描述",
       "prop": "cnameDescription",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     }

src/views/exportTrade/receipt/config/commodity.json

@@ -1,6 +1,8 @@
 {
   "border": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
+  "searchIcon": true,
+  "searchIndex": 2,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
@@ -11,55 +13,67 @@
   "menuWidth": "180",
   "selection": true,
   "tip": false,
-  "column": [
-    {
+  "column": [{
       "label": "商品编号",
       "prop": "code",
       "index": 1,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "商品名称",
       "search": true,
-      "searchSpan": 16,
+      "searchSpan": 8,
       "prop": "cname",
       "index": 2,
       "width": 100,
       "overHidden": true
     },
     {
+      "label": "英文名称",
+      "prop": "ename",
+      "index": 3,
+      "width": 100,
+      "search": true,
+      "searchSpan": 8,
+      "overHidden": true
+    },
+    {
       "label": "商品类别",
       "prop": "goodsTypeName",
-      "index": 3,
+      "index": 4,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "中文规格",
       "prop": "typeno",
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文规格",
       "prop": "etypeno",
-      "index": 5,
+      "index": 6,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "中文描述",
       "prop": "nameDescription",
-      "index": 6,
+      "index": 7,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "英文描述",
       "prop": "cnameDescription",
-      "index": 7,
+      "index": 8,
       "width": 100,
       "overHidden": true
     }

src/views/exportTrade/receipt/detailsPage.vue

@@ -188,6 +188,7 @@
         typeUpload="CK"
         :data="orderFilesList"
         :disabled="detailData.status == 1"
+        :enumerationValue="76"
         deleteUrl="/blade-deliver-goods/deliveryfiles/update"
       />
     </div>

src/views/exportTrade/salesContract/config/commodity.json

@@ -1,6 +1,8 @@
 {
   "border": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
+  "searchIcon": true,
+  "searchIndex": 2,
   "index": true,
   "viewBtn": false,
   "editBtn": false,
@@ -16,12 +18,14 @@
       "prop": "code",
       "index": 1,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
       "label": "商品名称",
       "search": true,
-      "searchSpan": 16,
+      "searchSpan": 8,
       "prop": "cname",
       "index": 2,
       "width": 100,
@@ -32,6 +36,8 @@
       "prop": "ename",
       "index": 3,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {
@@ -39,6 +45,8 @@
       "prop": "goodsTypeName",
       "index": 4,
       "width": 100,
+      "search": true,
+      "searchSpan": 8,
       "overHidden": true
     },
     {

src/views/exportTrade/salesContract/detailsPage.vue

@@ -510,6 +510,7 @@
         typeUpload="CK"
         :data="orderFilesList"
         :disabled="detailData.status == 1"
+        :enumerationValue="76"
         deleteUrl="/blade-purchase-sales/orderfiles/update"
       />
       <div>

src/views/maintenance/priceLibrary/config/mainList.json

@@ -1,6 +1,6 @@
 {
   "searchShow": true,
-  "searchMenuSpan": 8,
+  "searchMenuSpan": 16,
   "border": true,
   "index": true,
   "stripe": true,
@@ -13,13 +13,14 @@
   "showSummary": true,
   "searchIcon": true,
   "searchIndex": 2,
-  "column": [
-    {
+  "column": [{
       "label": "商品编号",
       "prop": "code",
       "index": 1,
       "width": 100,
-      "overHidden": true
+      "search": true,
+      "overHidden": true,
+      "searchSpan": 8
     },
     {
       "label": "商品名称",
@@ -35,6 +36,7 @@
       "prop": "ename",
       "index": 3,
       "width": 100,
+      "search": true,
       "overHidden": true,
       "searchSpan": 8
     },

src/views/maintenance/priceLibrary/index.vue

@@ -10,6 +10,7 @@
         :search.sync="search"
         @search-change="searchChange"
         @current-change="currentChange"
+        @resetColumn="resetColumn"
         @size-change="sizeChange"
         @refresh-change="refreshChange"
         @on-load="onLoad"
@@ -152,7 +153,7 @@
             type="text"
             icon="el-icon-delete"
             size="small"
-            @click.stop="rowDel(row,index)"
+            @click.stop="rowDel(row, index)"
             >删除
           </el-button>
         </template>
@@ -432,6 +433,14 @@ export default {
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
+    },
+    async resetColumn() {
+      this.option = option;
+      const inSave = await this.delColumnData(this.getColumnName(50), option);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
     }
   }
 };

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -26,7 +26,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-              :disabled="form.status > 0"
+              disabled
               @click.native="pleaseCheck"
               >请核数据</el-dropdown-item
             >
@@ -872,11 +872,14 @@
             class="schoolupload"
           >
             <template slot="excelTemplate">
-              <div style="display:flex">
-                <el-button type="primary" @click="derivation">
-                  点击下载<i class="el-icon-download el-icon--right"></i>
-                </el-button>
-              </div>
+              <el-button type="primary" @click="derivation">
+                点击下载<i class="el-icon-download el-icon--right"></i>
+              </el-button>
+            </template>
+            <template slot="date">
+              <span>
+                {{ time }}
+              </span>
             </template>
           </avue-form>
           <p style="text-align: center;color: #DC0505">
@@ -914,12 +917,34 @@
         reportName="高中部"
         @onClose="onClose()"
       ></report-dialog>
+      <el-dialog
+        title="温馨提示"
+        :visible.sync="dialogVisible"
+        width="70%"
+        :before-close="handleClose"
+        append-to-body
+        class='abnormal'
+      >
+        <span>
+          <avue-crud :data="auditList" :option="auditOption">
+            <template slot="menuLeft">
+              <el-button type="info" size="small" @click.stop="exportAbnormal()"
+                >导出
+              </el-button>
+            </template>
+          </avue-crud></span
+        >
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">关闭</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
 import { getToken } from "@/util/auth";
+import { dateFormat } from "@/util/date";
 import {
   detail,
   copyDetail,
@@ -931,12 +956,14 @@ import {
   calculate
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
-import { optionList } from "./js/optionList";
+import { optionList, auditOption } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
 export default {
   name: "detailsPage",
   data() {
     return {
+      time: "",
+      dialogVisible: false,
       switchDialog: false,
       annexLoading: false,
       crudForm: {},
@@ -968,12 +995,11 @@ export default {
             label: "模板下载",
             prop: "excelTemplate",
             formslot: true,
-            span: 8
+            span: 10
           },
           {
-            label: "日期",
+            label: "当前时间",
             prop: "date",
-            type: "datetime",
             span: 13
           },
           {
@@ -1187,7 +1213,9 @@ export default {
           450,
           500
         ]
-      }
+      },
+      auditList: [],
+      auditOption: auditOption
     };
   },
   props: {
@@ -1207,8 +1235,14 @@ export default {
     }
     this.optionList.height = 450;
     this.annexOption.height = 450;
+    this.auditOption.height = 600;
   },
   methods: {
+    getTime() {
+      setInterval(() => {
+        this.time = dateFormat(new Date());
+      }, 1000);
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -1509,6 +1543,7 @@ export default {
         }
       });
       this.excelBox = true;
+      this.getTime();
     },
     //导出全部
     exportAll() {
@@ -1676,14 +1711,14 @@ export default {
     },
     openEdit() {
       const data = {
-        moduleName: "xxb",
+        moduleName: "gzb",
         tableName: "primary_school",
         billId: this.form.id,
         no: localStorage.getItem("browserID"),
         billNo: this.form.annual + "-" + this.form.moon
       };
       this.inDetailsKey(this.$route.name, {
-        moduleName: "xxb",
+        moduleName: "gzb",
         tableName: "primary_school",
         billId: this.form.id,
         billNo: this.form.annual + "-" + this.form.moon
@@ -1711,25 +1746,41 @@ export default {
       }).then(() => {
         const data = {
           id: this.form.id,
-          checkType: "gzgz",
+          checkType: "xsgz",
           url: "/salaryManagement/primarySchool/index",
           pageStatus: "this.$store.getters.domSaleStatus",
           pageLabel: "高中部",
           checkFlag: 2
         };
         pleaseCheck(data).then(res => {
-          this.$message.success("请核成功");
-          this.detailData.status = 1;
-          this.option.disabled = true;
-          this.getDetail(this.form.id);
+          if (res.data.msg == "请核失败") {
+            this.dialogVisible = true;
+            this.auditList = res.data.data;
+          } else {
+            this.$message.success("请核成功");
+            this.detailData.status = 1;
+            this.option.disabled = true;
+            this.getDetail(this.form.id);
+          }
         });
       });
     },
+    handleClose() {
+      this.auditList = [];
+      this.dialogVisible = false
+    },
+    exportAbnormal() {
+      window.open(
+        `/api//blade-school/salaryitem/export/exception?${
+          this.website.tokenHeader
+        }=${getToken()}&pid=${this.form.id}`
+      );
+    },
     //返回列表
     backToList() {
       if (this.form.id) {
         this.unLock({
-          moduleName: "xxb",
+          moduleName: "gzb",
           tableName: "primary_school",
           billId: this.form.id,
           billNo: this.form.annual + "-" + this.form.moon
@@ -2023,4 +2074,7 @@ export default {
 .schoolupload ::v-deep .el-upload-list {
   display: none;
 }
+.abnormal ::v-deep .el-dialog__body {
+    padding: 10px 20px;
+}
 </style>

src/views/salaryManagement/highSchool/js/optionList.js

@@ -1367,3 +1367,91 @@ export const optionList = {
     }
   ]
 }
+export const auditOption = {
+  addBtn: false,
+  border: true,
+  align: "center",
+  index: true,
+  viewBtn: false,
+  menu:false,
+  column: [
+    {
+      label: "姓名",
+      prop: "cname",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "身份证号",
+      prop: "idNumber",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工资拨付标准",
+      prop: "salaryWithdrawalStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "职级拨付标准",
+      prop: "rankWithdrawalStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "职级标准",
+      prop: "rankStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工资基数标准",
+      prop: "salaryBaseName",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工作量工资标准",
+      prop: "workloadSalaryCritertion",
+      width: 120,
+      overHidden: true,
+    },
+    {
+      label: "虚拟工作量工资标准",
+      prop: "virtualWorkloadSalary",
+      width: 140,
+      overHidden: true,
+    },
+    {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "日常考核标准",
+      prop: "dailyAssessmentCriteria",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "学期绩效标准",
+      prop: "termPerformanceSalaryName",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "其它标准",
+      prop: "otherCriterion",
+      width: 100,
+      overHidden: true,
+    },
+  ]
+}

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -26,7 +26,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-              :disabled="form.status > 0"
+             disabled
               @click.native="pleaseCheck"
               >请核数据</el-dropdown-item
             >
@@ -876,6 +876,11 @@
                 点击下载<i class="el-icon-download el-icon--right"></i>
               </el-button>
             </template>
+            <template slot="date">
+              <span>
+                {{ time }}
+              </span>
+            </template>
           </avue-form>
           <p style="text-align: center;color: #DC0505">
             温馨提示 第一次导入时请先下载模板
@@ -912,12 +917,34 @@
         reportName="初中部"
         @onClose="onClose()"
       ></report-dialog>
+      <el-dialog
+        title="温馨提示"
+        :visible.sync="dialogVisible"
+        width="70%"
+        :before-close="handleClose"
+        append-to-body
+        class='abnormal'
+      >
+        <span>
+          <avue-crud :data="auditList" :option="auditOption">
+            <template slot="menuLeft">
+              <el-button type="info" size="small" @click.stop="exportAbnormal()"
+                >导出
+              </el-button>
+            </template>
+          </avue-crud></span
+        >
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">关闭</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
 import { getToken } from "@/util/auth";
+import { dateFormat } from "@/util/date";
 import {
   detail,
   copyDetail,
@@ -929,12 +956,14 @@ import {
   calculate
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
-import { optionList } from "./js/optionList";
+import { optionList, auditOption } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
 export default {
   name: "detailsPage",
   data() {
     return {
+      time: "",
+      dialogVisible: false,
       switchDialog: false,
       annexLoading: false,
       crudForm: {},
@@ -966,12 +995,11 @@ export default {
             label: "模板下载",
             prop: "excelTemplate",
             formslot: true,
-            span: 8
+            span: 10
           },
           {
-            label: "日期",
+            label: "当前时间",
             prop: "date",
-            type: "datetime",
             span: 13
           },
           {
@@ -1185,7 +1213,9 @@ export default {
           450,
           500
         ]
-      }
+      },
+      auditList: [],
+      auditOption: auditOption
     };
   },
   props: {
@@ -1205,8 +1235,14 @@ export default {
     }
     this.optionList.height = 450;
     this.annexOption.height = 450;
+    this.auditOption.height = 600;
   },
   methods: {
+    getTime() {
+      setInterval(() => {
+        this.time = dateFormat(new Date());
+      }, 1000);
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -1507,6 +1543,7 @@ export default {
         }
       });
       this.excelBox = true;
+      this.getTime();
     },
     //导出全部
     exportAll() {
@@ -1674,14 +1711,14 @@ export default {
     },
     openEdit() {
       const data = {
-        moduleName: "xxb",
+        moduleName: "czb",
         tableName: "primary_school",
         billId: this.form.id,
         no: localStorage.getItem("browserID"),
         billNo: this.form.annual + "-" + this.form.moon
       };
       this.inDetailsKey(this.$route.name, {
-        moduleName: "xxb",
+        moduleName: "czb",
         tableName: "primary_school",
         billId: this.form.id,
         billNo: this.form.annual + "-" + this.form.moon
@@ -1709,25 +1746,41 @@ export default {
       }).then(() => {
         const data = {
           id: this.form.id,
-          checkType: "czgz",
+          checkType: "xsgz",
           url: "/salaryManagement/primarySchool/index",
           pageStatus: "this.$store.getters.domSaleStatus",
           pageLabel: "初中部",
           checkFlag: 2
         };
         pleaseCheck(data).then(res => {
-          this.$message.success("请核成功");
-          this.detailData.status = 1;
-          this.option.disabled = true;
-          this.getDetail(this.form.id);
+          if (res.data.msg == "请核失败") {
+            this.dialogVisible = true;
+            this.auditList = res.data.data;
+          } else {
+            this.$message.success("请核成功");
+            this.detailData.status = 1;
+            this.option.disabled = true;
+            this.getDetail(this.form.id);
+          }
         });
       });
     },
+    handleClose() {
+      this.auditList = [];
+      this.dialogVisible = false
+    },
+    exportAbnormal() {
+      window.open(
+        `/api//blade-school/salaryitem/export/exception?${
+          this.website.tokenHeader
+        }=${getToken()}&pid=${this.form.id}`
+      );
+    },
     //返回列表
     backToList() {
       if (this.form.id) {
         this.unLock({
-          moduleName: "xxb",
+          moduleName: "czb",
           tableName: "primary_school",
           billId: this.form.id,
           billNo: this.form.annual + "-" + this.form.moon
@@ -2021,4 +2074,7 @@ export default {
 .schoolupload ::v-deep .el-upload-list {
   display: none;
 }
+.abnormal ::v-deep .el-dialog__body {
+    padding: 10px 20px;
+}
 </style>

src/views/salaryManagement/juniorhighSchool/js/optionList.js

@@ -1367,3 +1367,91 @@ export const optionList = {
     }
   ]
 }
+export const auditOption = {
+  addBtn: false,
+  border: true,
+  align: "center",
+  index: true,
+  viewBtn: false,
+  menu:false,
+  column: [
+    {
+      label: "姓名",
+      prop: "cname",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "身份证号",
+      prop: "idNumber",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工资拨付标准",
+      prop: "salaryWithdrawalStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "职级拨付标准",
+      prop: "rankWithdrawalStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "职级标准",
+      prop: "rankStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工资基数标准",
+      prop: "salaryBaseName",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工作量工资标准",
+      prop: "workloadSalaryCritertion",
+      width: 120,
+      overHidden: true,
+    },
+    {
+      label: "虚拟工作量工资标准",
+      prop: "virtualWorkloadSalary",
+      width: 140,
+      overHidden: true,
+    },
+    {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "日常考核标准",
+      prop: "dailyAssessmentCriteria",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "学期绩效标准",
+      prop: "termPerformanceSalaryName",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "其它标准",
+      prop: "otherCriterion",
+      width: 100,
+      overHidden: true,
+    },
+  ]
+}

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -26,7 +26,7 @@
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item
-              :disabled="form.status > 0"
+              disabled
               @click.native="pleaseCheck"
               >请核数据</el-dropdown-item
             >
@@ -876,6 +876,11 @@
                 点击下载<i class="el-icon-download el-icon--right"></i>
               </el-button>
             </template>
+            <template slot="date">
+              <span>
+                {{ time }}
+              </span>
+            </template>
           </avue-form>
           <p style="text-align: center;color: #DC0505">
             温馨提示 第一次导入时请先下载模板
@@ -912,12 +917,34 @@
         reportName="后勤部"
         @onClose="onClose()"
       ></report-dialog>
+      <el-dialog
+        title="温馨提示"
+        :visible.sync="dialogVisible"
+        width="70%"
+        :before-close="handleClose"
+        append-to-body
+        class='abnormal'
+      >
+        <span>
+          <avue-crud :data="auditList" :option="auditOption">
+            <template slot="menuLeft">
+              <el-button type="info" size="small" @click.stop="exportAbnormal()"
+                >导出
+              </el-button>
+            </template>
+          </avue-crud></span
+        >
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">关闭</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
 import { getToken } from "@/util/auth";
+import { dateFormat } from "@/util/date";
 import {
   detail,
   copyDetail,
@@ -929,12 +956,14 @@ import {
   calculate
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
-import { optionList } from "./js/optionList";
+import { optionList, auditOption } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
 export default {
   name: "detailsPage",
   data() {
     return {
+      time: "",
+      dialogVisible: false,
       switchDialog: false,
       annexLoading: false,
       crudForm: {},
@@ -966,12 +995,11 @@ export default {
             label: "模板下载",
             prop: "excelTemplate",
             formslot: true,
-            span: 8
+            span: 10
           },
           {
-            label: "日期",
+            label: "当前时间",
             prop: "date",
-            type: "datetime",
             span: 13
           },
           {
@@ -1185,7 +1213,9 @@ export default {
           450,
           500
         ]
-      }
+      },
+      auditList: [],
+      auditOption: auditOption
     };
   },
   props: {
@@ -1205,8 +1235,14 @@ export default {
     }
     this.optionList.height = 450;
     this.annexOption.height = 450;
+    this.auditOption.height = 600;
   },
   methods: {
+    getTime() {
+      setInterval(() => {
+        this.time = dateFormat(new Date());
+      }, 1000);
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -1507,6 +1543,7 @@ export default {
         }
       });
       this.excelBox = true;
+      this.getTime();
     },
     //导出全部
     exportAll() {
@@ -1674,14 +1711,14 @@ export default {
     },
     openEdit() {
       const data = {
-        moduleName: "xxb",
+        moduleName: "hqb",
         tableName: "primary_school",
         billId: this.form.id,
         no: localStorage.getItem("browserID"),
         billNo: this.form.annual + "-" + this.form.moon
       };
       this.inDetailsKey(this.$route.name, {
-        moduleName: "xxb",
+        moduleName: "hqb",
         tableName: "primary_school",
         billId: this.form.id,
         billNo: this.form.annual + "-" + this.form.moon
@@ -1709,25 +1746,41 @@ export default {
       }).then(() => {
         const data = {
           id: this.form.id,
-          checkType: "hqgz",
+          checkType: "xsgz",
           url: "/salaryManagement/primarySchool/index",
           pageStatus: "this.$store.getters.domSaleStatus",
           pageLabel: "后勤部",
           checkFlag: 2
         };
         pleaseCheck(data).then(res => {
-          this.$message.success("请核成功");
-          this.detailData.status = 1;
-          this.option.disabled = true;
-          this.getDetail(this.form.id);
+          if (res.data.msg == "请核失败") {
+            this.dialogVisible = true;
+            this.auditList = res.data.data;
+          } else {
+            this.$message.success("请核成功");
+            this.detailData.status = 1;
+            this.option.disabled = true;
+            this.getDetail(this.form.id);
+          }
         });
       });
     },
+    handleClose() {
+      this.auditList = [];
+      this.dialogVisible = false
+    },
+    exportAbnormal() {
+      window.open(
+        `/api//blade-school/salaryitem/export/exception?${
+          this.website.tokenHeader
+        }=${getToken()}&pid=${this.form.id}`
+      );
+    },
     //返回列表
     backToList() {
       if (this.form.id) {
         this.unLock({
-          moduleName: "xxb",
+          moduleName: "hqb",
           tableName: "primary_school",
           billId: this.form.id,
           billNo: this.form.annual + "-" + this.form.moon
@@ -2021,4 +2074,7 @@ export default {
 .schoolupload ::v-deep .el-upload-list {
   display: none;
 }
+.abnormal ::v-deep .el-dialog__body {
+    padding: 10px 20px;
+}
 </style>

src/views/salaryManagement/logisticsDepartment/js/optionList.js

@@ -1367,3 +1367,91 @@ export const optionList = {
     }
   ]
 }
+export const auditOption = {
+  addBtn: false,
+  border: true,
+  align: "center",
+  index: true,
+  viewBtn: false,
+  menu:false,
+  column: [
+    {
+      label: "姓名",
+      prop: "cname",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "身份证号",
+      prop: "idNumber",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工资拨付标准",
+      prop: "salaryWithdrawalStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "职级拨付标准",
+      prop: "rankWithdrawalStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "职级标准",
+      prop: "rankStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工资基数标准",
+      prop: "salaryBaseName",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工作量工资标准",
+      prop: "workloadSalaryCritertion",
+      width: 120,
+      overHidden: true,
+    },
+    {
+      label: "虚拟工作量工资标准",
+      prop: "virtualWorkloadSalary",
+      width: 140,
+      overHidden: true,
+    },
+    {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "日常考核标准",
+      prop: "dailyAssessmentCriteria",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "学期绩效标准",
+      prop: "termPerformanceSalaryName",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "其它标准",
+      prop: "otherCriterion",
+      width: 100,
+      overHidden: true,
+    },
+  ]
+}

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -876,6 +876,11 @@
                 点击下载<i class="el-icon-download el-icon--right"></i>
               </el-button>
             </template>
+            <template slot="date">
+              <span>
+                {{ time }}
+              </span>
+            </template>
           </avue-form>
           <p style="text-align: center;color: #DC0505">
             温馨提示 第一次导入时请先下载模板
@@ -912,12 +917,34 @@
         reportName="小学部"
         @onClose="onClose()"
       ></report-dialog>
+      <el-dialog
+        title="温馨提示"
+        :visible.sync="dialogVisible"
+        width="70%"
+        :before-close="handleClose"
+        append-to-body
+        class='abnormal'
+      >
+        <span>
+          <avue-crud :data="auditList" :option="auditOption">
+            <template slot="menuLeft">
+              <el-button type="info" size="small" @click.stop="exportAbnormal()"
+                >导出
+              </el-button>
+            </template>
+          </avue-crud></span
+        >
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">关闭</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
 import { getToken } from "@/util/auth";
+import { dateFormat } from "@/util/date";
 import {
   detail,
   copyDetail,
@@ -929,12 +956,14 @@ import {
   calculate
 } from "@/api/salaryManagement/primarySchool";
 import { numCal } from "@/util/calculate";
-import { optionList } from "./js/optionList";
+import { optionList, auditOption } from "./js/optionList";
 import reportDialog from "@/components/report-dialog/main";
 export default {
   name: "detailsPage",
   data() {
     return {
+      time: "",
+      dialogVisible: false,
       switchDialog: false,
       annexLoading: false,
       crudForm: {},
@@ -966,12 +995,11 @@ export default {
             label: "模板下载",
             prop: "excelTemplate",
             formslot: true,
-            span: 8
+            span: 10
           },
           {
-            label: "日期",
+            label: "当前时间",
             prop: "date",
-            type: "datetime",
             span: 13
           },
           {
@@ -1185,7 +1213,9 @@ export default {
           450,
           500
         ]
-      }
+      },
+      auditList: [],
+      auditOption: auditOption
     };
   },
   props: {
@@ -1205,8 +1235,14 @@ export default {
     }
     this.optionList.height = 450;
     this.annexOption.height = 450;
+    this.auditOption.height = 600;
   },
   methods: {
+    getTime() {
+      setInterval(() => {
+        this.time = dateFormat(new Date());
+      }, 1000);
+    },
     cellStyle() {
       return "padding:0;height:40px;";
     },
@@ -1488,7 +1524,7 @@ export default {
       calculate({ pid: this.form.id })
         .then(res => {
           if (res.data.code == "200") {
-            this.getItemDetail()
+            this.getItemDetail();
           }
         })
         .finally(() => {
@@ -1507,6 +1543,7 @@ export default {
         }
       });
       this.excelBox = true;
+      this.getTime();
     },
     //导出全部
     exportAll() {
@@ -1716,13 +1753,29 @@ export default {
           checkFlag: 2
         };
         pleaseCheck(data).then(res => {
-          this.$message.success("请核成功");
-          this.detailData.status = 1;
-          this.option.disabled = true;
-          this.getDetail(this.form.id);
+          if (res.data.msg == "请核失败") {
+            this.dialogVisible = true;
+            this.auditList = res.data.data;
+          } else {
+            this.$message.success("请核成功");
+            this.detailData.status = 1;
+            this.option.disabled = true;
+            this.getDetail(this.form.id);
+          }
         });
       });
     },
+    handleClose() {
+      this.auditList = [];
+      this.dialogVisible = false
+    },
+    exportAbnormal() {
+      window.open(
+        `/api//blade-school/salaryitem/export/exception?${
+          this.website.tokenHeader
+        }=${getToken()}&pid=${this.form.id}`
+      );
+    },
     //返回列表
     backToList() {
       if (this.form.id) {
@@ -2021,4 +2074,7 @@ export default {
 .schoolupload ::v-deep .el-upload-list {
   display: none;
 }
+.abnormal ::v-deep .el-dialog__body {
+    padding: 10px 20px;
+}
 </style>

src/views/salaryManagement/primarySchool/js/optionList.js

@@ -1367,3 +1367,91 @@ export const optionList = {
     }
   ]
 }
+export const auditOption = {
+  addBtn: false,
+  border: true,
+  align: "center",
+  index: true,
+  viewBtn: false,
+  menu:false,
+  column: [
+    {
+      label: "姓名",
+      prop: "cname",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "身份证号",
+      prop: "idNumber",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工资拨付标准",
+      prop: "salaryWithdrawalStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "职级拨付标准",
+      prop: "rankWithdrawalStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "职级标准",
+      prop: "rankStandard",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工资基数标准",
+      prop: "salaryBaseName",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "工作量工资标准",
+      prop: "workloadSalaryCritertion",
+      width: 120,
+      overHidden: true,
+    },
+    {
+      label: "虚拟工作量工资标准",
+      prop: "virtualWorkloadSalary",
+      width: 140,
+      overHidden: true,
+    },
+    {
+      label: "双休日工作量工资标准",
+      prop: "doubleCease",
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "日常考核标准",
+      prop: "dailyAssessmentCriteria",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "虚拟日常考核标准",
+      prop: "virtualDailyAssessmentCriteria",
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "学期绩效标准",
+      prop: "termPerformanceSalaryName",
+      width: 100,
+      overHidden: true,
+    },
+    {
+      label: "其它标准",
+      prop: "otherCriterion",
+      width: 100,
+      overHidden: true,
+    },
+  ]
+}

src/views/statisticAnalysis/salesProfit/index.vue

@@ -21,6 +21,11 @@
         @expand-change="expandChange"
         @search-criteria-switch="searchCriteriaSwitch"
       >
+        <template slot="menuLeft">
+          <el-button type="info" size="small" @click="outExport"
+            >导出</el-button
+          >
+        </template>
         <template slot-scope="{ row }" slot="expand">
           <avue-crud
             :data="row.itemData"
@@ -57,6 +62,7 @@
 </template>
 
 <script>
+import { getToken } from "@/util/auth";
 import { getList, getProfitItem } from "@/api/statisticAnalysis/salesProfit";
 import { micrometerFormat } from "@/util/validate";
 import _ from "lodash";
@@ -76,7 +82,7 @@ export default {
       },
       option: {
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 16,
         align: "center",
         searchSpan: 8,
         border: true,
@@ -85,16 +91,31 @@ export default {
         viewBtn: false,
         editBtn: false,
         delBtn: false,
-        menuWidth: 120,
         showSummary: true,
-        searchLabelWidth: 100,
         searchIcon: true,
         searchIndex: 2,
         expand: true,
-        expandWidth: 45,
+        expandWidth: 55,
         menu: false,
         column: [
           {
+            label: "类别",
+            prop: "billType",
+            type: "select",
+            searchValue: "XS",
+            dicData: [
+              {
+                label: "销售",
+                value: "XS"
+              },
+              {
+                label: "报价",
+                value: "BJ"
+              }
+            ],
+            search: true
+          },
+          {
             label: "合同号",
             prop: "orderNo",
             overHidden: true,
@@ -139,6 +160,12 @@ export default {
             width: 100
           },
           {
+            label: "采购成本",
+            prop: "procurementCost",
+            overHidden: true,
+            width: 100
+          },
+          {
             label: "采购报价",
             prop: "purchasePrice",
             overHidden: true,
@@ -306,12 +333,19 @@ export default {
       this.page.currentPage = 1;
       this.page.pageSize = val;
     },
-    onLoad(page, params) {
+    onLoad(page, params = {}) {
       this.loading = true;
+      if (!this.search.billType) {
+        this.search.billType = "XS";
+      }
       this.dataList.forEach(item => {
         this.$refs.crud.toggleRowExpansion(item, false);
       });
-      getList(page.currentPage, page.pageSize, params)
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.search)
+      )
         .then(res => {
           if (res.data.data.records) {
             res.data.data.records.forEach(e => {
@@ -339,6 +373,16 @@ export default {
       };
       this.isShow = false;
     },
+    outExport(){
+         if (!this.search.billType) {
+        return this.$message.error("请选择类别");
+      }
+      window.open(
+        `/api/blade-purchase-sales/exportOrder/exportProfit?${
+          this.website.tokenHeader
+        }=${getToken()}&billType=${this.search.billType}`
+      );
+    },
     goBack() {
       this.detailData = this.$options.data().detailData;
       this.isShow = true;