Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy

src/mixins/JeecgListMixin.js

@@ -89,8 +89,7 @@ export const JeecgListMixin = {
         if (res.success) {
           //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
           this.dataSource = res.result.records || res.result;
-          if(res.result.total)
+          if (res.result.total) {
-          {
             this.ipagination.total = res.result.total;
           } else {
             this.ipagination.total = 0;
@@ -126,7 +125,8 @@ export const JeecgListMixin = {
         sqp['superQueryMatchType'] = this.superQueryMatchType
       }
       var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
-      param.field = this.getQueryField();
+      // param.field = this.getQueryField();
+      param.field = this.isorter.column;
       param.pageNo = this.ipagination.current;
       param.pageSize = this.ipagination.pageSize;
       return filterObj(param);
@@ -237,6 +237,7 @@ export const JeecgListMixin = {
       this.$refs.modalForm.disableSubmit = false;
     },
     handleTableChange(pagination, filters, sorter) {
+      console.log("sortersorter", sorter);
       //分页、排序、筛选变化时触发
       //TODO 筛选
       console.log(pagination)

src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue

@@ -75,6 +75,7 @@ const columns = [
     title: 'Col.Stop',
     align: 'left',
     dataIndex: 'collectStop',
+    sorter: true,
     width: 170,
   },
   {
@@ -434,7 +435,7 @@ export default {
             allowClear: true,
           },
           style: {
-            width: '264px',
+            width: '207px',
           },
         },
         {
@@ -465,7 +466,7 @@ export default {
             },
           },
           style: {
-            width: '19%',
+            width: '16%',
           },
         },
         {
@@ -481,8 +482,43 @@ export default {
           },
           style: {
             paddingRight: 0,
-            marginRight: '22px',
+            marginRight: '8px',
-            width: '19%',
+            width: '13%',
+          },
+        },
+        {
+          label: 'Status',
+          type: 'custom-select',
+          name: 'status',
+          props: {
+            options: [
+              {
+                label: 'U',
+                value: 'U',
+              },
+              {
+                label: 'A',
+                value: 'A',
+              },
+              {
+                label: 'P',
+                value: 'P',
+              },
+              {
+                label: 'R',
+                value: 'R',
+              },
+              {
+                label: 'F',
+                value: 'F',
+              },
+            ],
+            allowClear: true,
+          },
+          style: {
+            width: '14%',
+
+            marginRight: '10px',
           },
         },
       ]