Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/components/scTable/index.vue

@@ -241,6 +241,9 @@ export default {
       if (this.query[this.orderStr]){
         reqData[this.orderStr] = this.query[this.orderStr]
       }
+      if (this.params[this.orderStr]){
+        reqData[this.orderStr] = this.params[this.orderStr]
+      }
       var c = Object.assign({}, this.query, this.tableParams, reqData)
       try {
         if (this.apiObj) {